From c71d89ee1a4d960c51709f796b590340da73f4ce Mon Sep 17 00:00:00 2001 From: martin rudalics Date: Tue, 26 Jun 2012 09:13:40 +0200 Subject: [PATCH] In calendar-exit don't try to delete or iconify last frame. * calendar/calendar.el (calendar-exit): Don't try to delete or iconify last frame. See: http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00372.html --- lisp/ChangeLog | 6 ++++++ lisp/calendar/calendar.el | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 63a4ff8c14f..69fee9471ee 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-06-26 Martin Rudalics + + * calendar/calendar.el (calendar-exit): Don't try to delete or + iconify last frame. See: + http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00372.html + 2012-06-25 Jim Diamond (tiny change) * server.el (server-process-filter): Remember dir in the diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index c47bbdff5ec..d5514d14a32 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1818,10 +1818,11 @@ the STRINGS are just concatenated and the result truncated." (dolist (w (window-list-1 nil nil t)) (if (and (memq (window-buffer w) calendar-buffers) (window-dedicated-p w)) - (if calendar-remove-frame-by-deleting - (delete-frame (window-frame w)) - (iconify-frame (window-frame w))) - (quit-window kill w))) + (if (eq (window-deletable-p w) 'frame) + (if calendar-remove-frame-by-deleting + (delete-frame (window-frame w)) + (iconify-frame (window-frame w))) + (quit-window kill w)))) (dolist (b calendar-buffers) (quit-windows-on b kill)))))) -- 2.30.2